Merge tag 'upstream/2017.5' into debian/master
authorSimon McVittie <smcv@debian.org>
Wed, 19 Apr 2017 13:13:50 +0000 (14:13 +0100)
committerSimon McVittie <smcv@debian.org>
Wed, 19 Apr 2017 13:13:50 +0000 (14:13 +0100)
Upstream version 2017.5


Trivial merge